From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 20 Nov 2019 21:15:26 +0000 (+0100)
Subject: dateMenu: Try harder finding a reasonable weather location name
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~781^2^2~382
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=784c0b7e4;p=gnome-shell.git

dateMenu: Try harder finding a reasonable weather location name

Weather stations can have unwieldy long names, which don't fit the
limited space we have available. City names are usually more suitable,
so use the name of the nearest city instead if possible.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/1927
---

diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 4595d6cfb..1e630897b 100644
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -388,7 +388,12 @@ class WeatherSection extends St.Button {
         }
 
         let info = this._weatherClient.info;
-        this._titleLocation.text = info.get_location().get_name();
+        let loc = info.get_location();
+        if (loc.get_level() !== GWeather.LocationLevel.CITY && loc.has_coords()) {
+            let world = GWeather.Location.get_world();
+            loc = world.find_nearest_city(...loc.get_coords());
+        }
+        this._titleLocation.text = loc.get_name();
 
         if (this._weatherClient.loading) {
             this._setStatusLabel(_("Loading…"));